Check if ENGINE_cleanup and PKCS7_NO_DUAL_CONTENT exist in OpenSSL build#20932
Open
jordikroon wants to merge 1 commit intophp:masterfrom
Open
Check if ENGINE_cleanup and PKCS7_NO_DUAL_CONTENT exist in OpenSSL build#20932jordikroon wants to merge 1 commit intophp:masterfrom
jordikroon wants to merge 1 commit intophp:masterfrom
Conversation
jordikroon
force-pushed
the
fix/gh-20920
branch
from
004cee4 to
f6502e5
Compare
botovq
reviewed
Jan 14, 2026
| * @cvalue PKCS7_NOCRL | ||
| */ | ||
| const PKCS7_NOCRL = UNKNOWN; | ||
| #ifndef OPENSSL_NO_RMD160 |
There was a problem hiding this comment.
Checking for presence of RMD-160 is a bit strange in this context. Did you mean #ifndef PKCS7_NO_DUAL_CONTENT?
| [[ENGINE_cleanup();]] | ||
| )], | ||
| [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_ENGINE_CLEANUP], [1], [Define if ENGINE_cleanup is available])], | ||
| [AC_MSG_RESULT([no])] |
There was a problem hiding this comment.
I think this will end up defining HAVE_ENGINE_CLEANUP for LibreSSL since it's still available. It's almost certainly the combination with OPENSSL_NO_ENGINE that's problematic: #20920 (comment)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #20920
Since some builds might still rely on
ENGINE_cleanup(not sure though). I think it's best to check for its existence instead of removing the function call.The check is only for LibreSSL, so maybe we don't need this fix for W32 build. However Libre states it also supports Win7 or later.